Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 13 May 2010 12:10:13 +0000 (12:10 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 13 May 2010 12:10:13 +0000 (12:10 +0000)
commitcf504c833ee1c0c403e32839f85105311b5ad81e
tree3deab186267a0485327eb2d0493187c3181cd1f0
parentcd3a326ce40de9d9d099521ae0fe79ddda0a84b5
parent29d91a2ab327ea94dd2472685e43d6bf685f314f
Merge from mainline.